Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses client / src / configuration /
drwxr-xr-x   ..
-rw-r--r-- 6148 .DS_Store
-rw-r--r-- 4410 ConfigXML.java
-rw-r--r-- 455 ___IntNames.java